Revert "iconhelper: check if surface was invalidated"
authorChristian Hergert <chergert@redhat.com>
Thu, 28 Apr 2016 02:02:25 +0000 (19:02 -0700)
committerChristian Hergert <chergert@redhat.com>
Thu, 28 Apr 2016 02:02:25 +0000 (19:02 -0700)
This reverts commit 88d02583974659d1d37d825df78c79bee4c95d0e.

gtk/gtkiconhelper.c

index 7baccb0ae36eee82d21cfd0ff83741158175c00d..b8737e7aa42b39bb672741eb2f0ee81d98acbd7f 100644 (file)
@@ -892,21 +892,15 @@ _gtk_icon_helper_draw (GtkIconHelper *self,
                        gdouble x,
                        gdouble y)
 {
-  GtkCssStyle *style;
-
   gtk_icon_helper_ensure_surface (self);
 
-  /*
-   * Get the style first as the rendered surface maybe cleared if the style
-   * must be recomputed
-   */
-  style = gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self)));
-
   if (self->priv->rendered_surface != NULL)
-    gtk_css_style_render_icon_surface (style,
-                                       cr,
-                                       self->priv->rendered_surface,
-                                       x, y);
+    {
+      gtk_css_style_render_icon_surface (gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self))),
+                                         cr,
+                                         self->priv->rendered_surface,
+                                         x, y);
+    }
 }
 
 gboolean